Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1 | git-push(1) |
| 2 | =========== |
| 3 | |
| 4 | NAME |
| 5 | ---- |
Junio C Hamano | 0107892 | 2006-03-10 00:31:47 | [diff] [blame] | 6 | git-push - Update remote refs along with associated objects |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 7 | |
| 8 | |
| 9 | SYNOPSIS |
| 10 | -------- |
Junio C Hamano | a9b8d24 | 2007-05-19 04:51:55 | [diff] [blame] | 11 | [verse] |
Junio C Hamano | 6bb32e6 | 2015-02-17 22:11:26 | [diff] [blame] | 12 | 'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>] |
Junio C Hamano | a7da1ba | 2016-01-13 00:19:45 | [diff] [blame] | 13 | [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose] |
Junio C Hamano | e48a113 | 2016-08-03 22:40:21 | [diff] [blame] | 14 | [-u | --set-upstream] [--push-option=<string>] |
Junio C Hamano | 4b2a6c1 | 2017-08-22 18:32:37 | [diff] [blame] | 15 | [--[no-]signed|--signed=(true|false|if-asked)] |
Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 16 | [--force-with-lease[=<refname>[:<expect>]]] |
Junio C Hamano | dc8f8de | 2013-06-05 22:58:07 | [diff] [blame] | 17 | [--no-verify] [<repository> [<refspec>...]] |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 18 | |
| 19 | DESCRIPTION |
| 20 | ----------- |
| 21 | |
| 22 | Updates remote refs using local refs, while sending objects |
| 23 | necessary to complete the given refs. |
| 24 | |
Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 25 | You can make interesting things happen to a repository |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 26 | every time you push into it, by setting up 'hooks' there. See |
Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 27 | documentation for linkgit:git-receive-pack[1]. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 28 | |
Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 29 | When the command line does not specify where to push with the |
| 30 | `<repository>` argument, `branch.*.remote` configuration for the |
| 31 | current branch is consulted to determine where to push. If the |
| 32 | configuration is missing, it defaults to 'origin'. |
| 33 | |
| 34 | When the command line does not specify what to push with `<refspec>...` |
| 35 | arguments or `--all`, `--mirror`, `--tags` options, the command finds |
| 36 | the default `<refspec>` by consulting `remote.*.push` configuration, |
| 37 | and if it is not found, honors `push.default` configuration to decide |
Junio C Hamano | e3b2b33 | 2014-12-12 23:34:53 | [diff] [blame] | 38 | what to push (See linkgit:git-config[1] for the meaning of `push.default`). |
Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 39 | |
Junio C Hamano | 76df4f7 | 2016-02-26 22:13:10 | [diff] [blame] | 40 | When neither the command-line nor the configuration specify what to |
| 41 | push, the default behavior is used, which corresponds to the `simple` |
| 42 | value for `push.default`: the current branch is pushed to the |
| 43 | corresponding upstream branch, but as a safety measure, the push is |
| 44 | aborted if the upstream branch does not have the same name as the |
| 45 | local one. |
| 46 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 47 | |
Junio C Hamano | ea82cff | 2009-03-18 01:54:48 | [diff] [blame] | 48 | OPTIONS[[OPTIONS]] |
| 49 | ------------------ |
Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 50 | <repository>:: |
| 51 | The "remote" repository that is destination of a push |
Junio C Hamano | cc0cb31 | 2009-01-22 03:38:50 | [diff] [blame] | 52 | operation. This parameter can be either a URL |
| 53 | (see the section <<URLS,GIT URLS>> below) or the name |
| 54 | of a remote (see the section <<REMOTES,REMOTES>> below). |
Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 55 | |
Junio C Hamano | 7f80ae8 | 2008-07-30 18:31:35 | [diff] [blame] | 56 | <refspec>...:: |
Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 57 | Specify what destination ref to update with what source object. |
Junio C Hamano | 8b6e23b | 2009-02-01 06:36:08 | [diff] [blame] | 58 | The format of a <refspec> parameter is an optional plus |
Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 59 | `+`, followed by the source object <src>, followed |
Junio C Hamano | 8b6e23b | 2009-02-01 06:36:08 | [diff] [blame] | 60 | by a colon `:`, followed by the destination ref <dst>. |
Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 61 | + |
Junio C Hamano | 8b6e23b | 2009-02-01 06:36:08 | [diff] [blame] | 62 | The <src> is often the name of the branch you would want to push, but |
| 63 | it can be any arbitrary "SHA-1 expression", such as `master~4` or |
Junio C Hamano | c27b733 | 2010-10-14 04:37:28 | [diff] [blame] | 64 | `HEAD` (see linkgit:gitrevisions[7]). |
Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 65 | + |
Junio C Hamano | 8b6e23b | 2009-02-01 06:36:08 | [diff] [blame] | 66 | The <dst> tells which ref on the remote side is updated with this |
| 67 | push. Arbitrary expressions cannot be used here, an actual ref must |
Junio C Hamano | b1acf02 | 2013-12-28 00:33:16 | [diff] [blame] | 68 | be named. |
| 69 | If `git push [<repository>]` without any `<refspec>` argument is set to |
| 70 | update some ref at the destination with `<src>` with |
| 71 | `remote.<repository>.push` configuration variable, `:<dst>` part can |
Junio C Hamano | ee61580 | 2015-10-29 21:45:26 | [diff] [blame] | 72 | be omitted--such a push will update a ref that `<src>` normally updates |
Junio C Hamano | b1acf02 | 2013-12-28 00:33:16 | [diff] [blame] | 73 | without any `<refspec>` on the command line. Otherwise, missing |
| 74 | `:<dst>` means to update the same ref as the `<src>`. |
Junio C Hamano | 8b6e23b | 2009-02-01 06:36:08 | [diff] [blame] | 75 | + |
Junio C Hamano | d533bdb | 2009-02-25 09:56:58 | [diff] [blame] | 76 | The object referenced by <src> is used to update the <dst> reference |
Junio C Hamano | abad6da | 2013-01-06 09:06:32 | [diff] [blame] | 77 | on the remote side. By default this is only allowed if <dst> is not |
| 78 | a tag (annotated or lightweight), and then only if it can fast-forward |
Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 79 | <dst>. By having the optional leading `+`, you can tell Git to update |
Junio C Hamano | abad6da | 2013-01-06 09:06:32 | [diff] [blame] | 80 | the <dst> ref even if it is not allowed by default (e.g., it is not a |
| 81 | fast-forward.) This does *not* attempt to merge <src> into <dst>. See |
Junio C Hamano | d533bdb | 2009-02-25 09:56:58 | [diff] [blame] | 82 | EXAMPLES below for details. |
Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 83 | + |
Junio C Hamano | 3f403b0 | 2006-12-13 10:14:13 | [diff] [blame] | 84 | `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`. |
Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 85 | + |
Junio C Hamano | 3f403b0 | 2006-12-13 10:14:13 | [diff] [blame] | 86 | Pushing an empty <src> allows you to delete the <dst> ref from |
| 87 | the remote repository. |
Junio C Hamano | b713ff1 | 2008-05-24 01:12:30 | [diff] [blame] | 88 | + |
Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 89 | The special refspec `:` (or `+:` to allow non-fast-forward updates) |
Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 90 | directs Git to push "matching" branches: for every branch that exists on |
Junio C Hamano | cc0cb31 | 2009-01-22 03:38:50 | [diff] [blame] | 91 | the local side, the remote side is updated if a branch of the same name |
Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 92 | already exists on the remote side. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 93 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 94 | --all:: |
Junio C Hamano | 1d669b8 | 2014-03-11 21:36:00 | [diff] [blame] | 95 | Push all branches (i.e. refs under `refs/heads/`); cannot be |
| 96 | used with other <refspec>. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 97 | |
Junio C Hamano | f54f08e | 2012-02-27 07:49:19 | [diff] [blame] | 98 | --prune:: |
| 99 | Remove remote branches that don't have a local counterpart. For example |
| 100 | a remote branch `tmp` will be removed if a local branch with the same |
| 101 | name doesn't exist any more. This also respects refspecs, e.g. |
Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 102 | `git push --prune remote refs/heads/*:refs/tmp/*` would |
Junio C Hamano | f54f08e | 2012-02-27 07:49:19 | [diff] [blame] | 103 | make sure that remote `refs/tmp/foo` will be removed if `refs/heads/foo` |
| 104 | doesn't exist. |
| 105 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 106 | --mirror:: |
Junio C Hamano | 9d2bbb7 | 2007-11-25 04:56:07 | [diff] [blame] | 107 | Instead of naming each ref to push, specifies that all |
Junio C Hamano | 4fdccb2 | 2010-02-19 09:58:14 | [diff] [blame] | 108 | refs under `refs/` (which includes but is not |
Junio C Hamano | a351d14 | 2008-06-21 09:40:40 | [diff] [blame] | 109 | limited to `refs/heads/`, `refs/remotes/`, and `refs/tags/`) |
Junio C Hamano | 9d2bbb7 | 2007-11-25 04:56:07 | [diff] [blame] | 110 | be mirrored to the remote repository. Newly created local |
| 111 | refs will be pushed to the remote end, locally updated refs |
| 112 | will be force updated on the remote end, and deleted refs |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 113 | will be removed from the remote end. This is the default |
| 114 | if the configuration option `remote.<remote>.mirror` is |
| 115 | set. |
Junio C Hamano | 9d2bbb7 | 2007-11-25 04:56:07 | [diff] [blame] | 116 | |
Junio C Hamano | d6fff40 | 2009-09-14 09:40:50 | [diff] [blame] | 117 | -n:: |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 118 | --dry-run:: |
Junio C Hamano | 764a667 | 2007-10-23 01:23:31 | [diff] [blame] | 119 | Do everything except actually send the updates. |
| 120 | |
Junio C Hamano | 48bc1ce | 2009-07-09 16:49:19 | [diff] [blame] | 121 | --porcelain:: |
| 122 | Produce machine-readable output. The output status line for each ref |
| 123 | will be tab-separated and sent to stdout instead of stderr. The full |
| 124 | symbolic names of the refs will be given. |
| 125 | |
Junio C Hamano | b141a92 | 2010-01-10 19:55:14 | [diff] [blame] | 126 | --delete:: |
| 127 | All listed refs are deleted from the remote repository. This is |
| 128 | the same as prefixing all refs with a colon. |
| 129 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 130 | --tags:: |
Junio C Hamano | 4fdccb2 | 2010-02-19 09:58:14 | [diff] [blame] | 131 | All refs under `refs/tags` are pushed, in |
Junio C Hamano | 02d6fa5 | 2006-01-16 08:23:23 | [diff] [blame] | 132 | addition to refspecs explicitly listed on the command |
| 133 | line. |
| 134 | |
Junio C Hamano | 240dc3f | 2013-03-25 23:37:03 | [diff] [blame] | 135 | --follow-tags:: |
| 136 | Push all the refs that would be pushed without this option, |
| 137 | and also push annotated tags in `refs/tags` that are missing |
Junio C Hamano | e6f28d0 | 2013-09-17 21:34:00 | [diff] [blame] | 138 | from the remote but are pointing at commit-ish that are |
Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 139 | reachable from the refs being pushed. This can also be specified |
Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 140 | with configuration variable `push.followTags`. For more |
| 141 | information, see `push.followTags` in linkgit:git-config[1]. |
Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 142 | |
Junio C Hamano | 3891e25 | 2015-08-31 23:06:13 | [diff] [blame] | 143 | --[no-]signed:: |
Junio C Hamano | 4b2a6c1 | 2017-08-22 18:32:37 | [diff] [blame] | 144 | --signed=(true|false|if-asked):: |
Junio C Hamano | 9236fea | 2014-10-14 22:28:09 | [diff] [blame] | 145 | GPG-sign the push request to update refs on the receiving |
| 146 | side, to allow it to be checked by the hooks and/or be |
Junio C Hamano | 3891e25 | 2015-08-31 23:06:13 | [diff] [blame] | 147 | logged. If `false` or `--no-signed`, no signing will be |
| 148 | attempted. If `true` or `--signed`, the push will fail if the |
| 149 | server does not support signed pushes. If set to `if-asked`, |
| 150 | sign if and only if the server supports signed pushes. The push |
| 151 | will also fail if the actual call to `gpg --sign` fails. See |
| 152 | linkgit:git-receive-pack[1] for the details on the receiving end. |
Junio C Hamano | 9236fea | 2014-10-14 22:28:09 | [diff] [blame] | 153 | |
Junio C Hamano | 6bb32e6 | 2015-02-17 22:11:26 | [diff] [blame] | 154 | --[no-]atomic:: |
| 155 | Use an atomic transaction on the remote side if available. |
| 156 | Either all refs are updated, or on error, no refs are updated. |
| 157 | If the server does not support atomic pushes the push will fail. |
| 158 | |
Junio C Hamano | e48a113 | 2016-08-03 22:40:21 | [diff] [blame] | 159 | -o:: |
| 160 | --push-option:: |
| 161 | Transmit the given string to the server, which passes them to |
| 162 | the pre-receive as well as the post-receive hook. The given string |
| 163 | must not contain a NUL or LF character. |
| 164 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 165 | --receive-pack=<git-receive-pack>:: |
Junio C Hamano | 1c95827 | 2009-01-12 18:04:21 | [diff] [blame] | 166 | --exec=<git-receive-pack>:: |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 167 | Path to the 'git-receive-pack' program on the remote |
Junio C Hamano | 1ce39ab | 2007-01-16 22:05:10 | [diff] [blame] | 168 | end. Sometimes useful when pushing to a remote |
| 169 | repository over ssh, and you do not have the program in |
| 170 | a directory on the default $PATH. |
| 171 | |
Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 172 | --[no-]force-with-lease:: |
| 173 | --force-with-lease=<refname>:: |
| 174 | --force-with-lease=<refname>:<expect>:: |
| 175 | Usually, "git push" refuses to update a remote ref that is |
| 176 | not an ancestor of the local ref used to overwrite it. |
| 177 | + |
Junio C Hamano | ba423bd | 2015-03-28 18:18:17 | [diff] [blame] | 178 | This option overrides this restriction if the current value of the |
| 179 | remote ref is the expected value. "git push" fails otherwise. |
Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 180 | + |
| 181 | Imagine that you have to rebase what you have already published. |
| 182 | You will have to bypass the "must fast-forward" rule in order to |
| 183 | replace the history you originally published with the rebased history. |
| 184 | If somebody else built on top of your original history while you are |
| 185 | rebasing, the tip of the branch at the remote may advance with her |
| 186 | commit, and blindly pushing with `--force` will lose her work. |
| 187 | + |
| 188 | This option allows you to say that you expect the history you are |
| 189 | updating is what you rebased and want to replace. If the remote ref |
| 190 | still points at the commit you specified, you can be sure that no |
Junio C Hamano | ba423bd | 2015-03-28 18:18:17 | [diff] [blame] | 191 | other people did anything to the ref. It is like taking a "lease" on |
| 192 | the ref without explicitly locking it, and the remote ref is updated |
| 193 | only if the "lease" is still valid. |
Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 194 | + |
| 195 | `--force-with-lease` alone, without specifying the details, will protect |
| 196 | all remote refs that are going to be updated by requiring their |
| 197 | current value to be the same as the remote-tracking branch we have |
Junio C Hamano | ba423bd | 2015-03-28 18:18:17 | [diff] [blame] | 198 | for them. |
Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 199 | + |
| 200 | `--force-with-lease=<refname>`, without specifying the expected value, will |
| 201 | protect the named ref (alone), if it is going to be updated, by |
| 202 | requiring its current value to be the same as the remote-tracking |
| 203 | branch we have for it. |
| 204 | + |
| 205 | `--force-with-lease=<refname>:<expect>` will protect the named ref (alone), |
| 206 | if it is going to be updated, by requiring its current value to be |
Junio C Hamano | af18294 | 2016-08-10 20:46:26 | [diff] [blame] | 207 | the same as the specified value `<expect>` (which is allowed to be |
Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 208 | different from the remote-tracking branch we have for the refname, |
| 209 | or we do not even have to have such a remote-tracking branch when |
Junio C Hamano | af18294 | 2016-08-10 20:46:26 | [diff] [blame] | 210 | this form is used). If `<expect>` is the empty string, then the named ref |
| 211 | must not already exist. |
Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 212 | + |
| 213 | Note that all forms other than `--force-with-lease=<refname>:<expect>` |
| 214 | that specifies the expected current value of the ref explicitly are |
| 215 | still experimental and their semantics may change as we gain experience |
| 216 | with this feature. |
| 217 | + |
| 218 | "--no-force-with-lease" will cancel all the previous --force-with-lease on the |
| 219 | command line. |
Junio C Hamano | beca340 | 2017-04-27 02:21:51 | [diff] [blame] | 220 | + |
| 221 | A general note on safety: supplying this option without an expected |
| 222 | value, i.e. as `--force-with-lease` or `--force-with-lease=<refname>` |
| 223 | interacts very badly with anything that implicitly runs `git fetch` on |
| 224 | the remote to be pushed to in the background, e.g. `git fetch origin` |
| 225 | on your repository in a cronjob. |
| 226 | + |
| 227 | The protection it offers over `--force` is ensuring that subsequent |
| 228 | changes your work wasn't based on aren't clobbered, but this is |
| 229 | trivially defeated if some background process is updating refs in the |
| 230 | background. We don't have anything except the remote tracking info to |
| 231 | go by as a heuristic for refs you're expected to have seen & are |
| 232 | willing to clobber. |
| 233 | + |
| 234 | If your editor or some other system is running `git fetch` in the |
| 235 | background for you a way to mitigate this is to simply set up another |
| 236 | remote: |
| 237 | + |
| 238 | git remote add origin-push $(git config remote.origin.url) |
| 239 | git fetch origin-push |
| 240 | + |
| 241 | Now when the background process runs `git fetch origin` the references |
| 242 | on `origin-push` won't be updated, and thus commands like: |
| 243 | + |
| 244 | git push --force-with-lease origin-push |
| 245 | + |
| 246 | Will fail unless you manually run `git fetch origin-push`. This method |
| 247 | is of course entirely defeated by something that runs `git fetch |
| 248 | --all`, in that case you'd need to either disable it or do something |
| 249 | more tedious like: |
| 250 | + |
| 251 | git fetch # update 'master' from remote |
| 252 | git tag base master # mark our base point |
| 253 | git rebase -i master # rewrite some commits |
| 254 | git push --force-with-lease=master:base master:master |
| 255 | + |
| 256 | I.e. create a `base` tag for versions of the upstream code that you've |
| 257 | seen and are willing to overwrite, then rewrite history, and finally |
| 258 | force push changes to `master` if the remote version is still at |
| 259 | `base`, regardless of what your local `remotes/origin/master` has been |
| 260 | updated to in the background. |
Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 261 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 262 | -f:: |
| 263 | --force:: |
Junio C Hamano | 560a1f6 | 2006-01-30 04:19:57 | [diff] [blame] | 264 | Usually, the command refuses to update a remote ref that is |
Junio C Hamano | 4cd1c0e | 2007-08-06 04:39:14 | [diff] [blame] | 265 | not an ancestor of the local ref used to overwrite it. |
Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 266 | Also, when `--force-with-lease` option is used, the command refuses |
| 267 | to update a remote ref whose current value does not match |
| 268 | what is expected. |
| 269 | + |
| 270 | This flag disables these checks, and can cause the remote repository |
| 271 | to lose commits; use it with care. |
| 272 | + |
| 273 | Note that `--force` applies to all the refs that are pushed, hence |
| 274 | using it with `push.default` set to `matching` or with multiple push |
| 275 | destinations configured with `remote.*.push` may overwrite refs |
| 276 | other than the current branch (including local refs that are |
| 277 | strictly behind their remote counterpart). To force a push to only |
| 278 | one branch, use a `+` in front of the refspec to push (e.g `git push |
| 279 | origin +master` to force a push to the `master` branch). See the |
| 280 | `<refspec>...` section above for details. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 281 | |
Junio C Hamano | a476efa | 2008-10-10 15:31:42 | [diff] [blame] | 282 | --repo=<repository>:: |
Junio C Hamano | 6bb32e6 | 2015-02-17 22:11:26 | [diff] [blame] | 283 | This option is equivalent to the <repository> argument. If both |
| 284 | are specified, the command-line argument takes precedence. |
Junio C Hamano | 1ce39ab | 2007-01-16 22:05:10 | [diff] [blame] | 285 | |
Junio C Hamano | d0d892c | 2010-01-24 20:06:29 | [diff] [blame] | 286 | -u:: |
| 287 | --set-upstream:: |
| 288 | For every branch that is up to date or successfully pushed, add |
| 289 | upstream (tracking) reference, used by argument-less |
| 290 | linkgit:git-pull[1] and other commands. For more information, |
Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 291 | see `branch.<name>.merge` in linkgit:git-config[1]. |
Junio C Hamano | d0d892c | 2010-01-24 20:06:29 | [diff] [blame] | 292 | |
Junio C Hamano | 3d1b5a1 | 2013-05-17 23:34:02 | [diff] [blame] | 293 | --[no-]thin:: |
Junio C Hamano | 4fdccb2 | 2010-02-19 09:58:14 | [diff] [blame] | 294 | These options are passed to linkgit:git-send-pack[1]. A thin transfer |
| 295 | significantly reduces the amount of sent data when the sender and |
| 296 | receiver share many of the same objects in common. The default is |
| 297 | \--thin. |
Junio C Hamano | 1ce39ab | 2007-01-16 22:05:10 | [diff] [blame] | 298 | |
Junio C Hamano | ea90ab3 | 2010-03-15 20:32:55 | [diff] [blame] | 299 | -q:: |
| 300 | --quiet:: |
| 301 | Suppress all output, including the listing of updated refs, |
| 302 | unless an error occurs. Progress is not reported to the standard |
| 303 | error stream. |
| 304 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 305 | -v:: |
| 306 | --verbose:: |
Junio C Hamano | 1ce39ab | 2007-01-16 22:05:10 | [diff] [blame] | 307 | Run verbosely. |
| 308 | |
Junio C Hamano | ea90ab3 | 2010-03-15 20:32:55 | [diff] [blame] | 309 | --progress:: |
| 310 | Progress status is reported on the standard error stream |
| 311 | by default when it is attached to a terminal, unless -q |
| 312 | is specified. This flag forces progress status even if the |
| 313 | standard error stream is not directed to a terminal. |
Junio C Hamano | 3d23a0a | 2009-10-19 08:04:30 | [diff] [blame] | 314 | |
Junio C Hamano | 409a33a | 2015-12-22 23:45:23 | [diff] [blame] | 315 | --no-recurse-submodules:: |
Junio C Hamano | e89102f | 2017-02-15 23:18:15 | [diff] [blame] | 316 | --recurse-submodules=check|on-demand|only|no:: |
Junio C Hamano | 409a33a | 2015-12-22 23:45:23 | [diff] [blame] | 317 | May be used to make sure all submodule commits used by the |
| 318 | revisions to be pushed are available on a remote-tracking branch. |
| 319 | If 'check' is used Git will verify that all submodule commits that |
| 320 | changed in the revisions to be pushed are available on at least one |
| 321 | remote of the submodule. If any commits are missing the push will |
| 322 | be aborted and exit with non-zero status. If 'on-demand' is used |
| 323 | all submodules that changed in the revisions to be pushed will be |
Junio C Hamano | e89102f | 2017-02-15 23:18:15 | [diff] [blame] | 324 | pushed. If on-demand was not able to push all necessary revisions it will |
| 325 | also be aborted and exit with non-zero status. If 'only' is used all |
| 326 | submodules will be recursively pushed while the superproject is left |
| 327 | unpushed. A value of 'no' or using `--no-recurse-submodules` can be used |
| 328 | to override the push.recurseSubmodules configuration variable when no |
| 329 | submodule recursion is required. |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 330 | |
Junio C Hamano | dc8f8de | 2013-06-05 22:58:07 | [diff] [blame] | 331 | --[no-]verify:: |
| 332 | Toggle the pre-push hook (see linkgit:githooks[5]). The |
Junio C Hamano | 1dbca52 | 2015-05-22 20:48:55 | [diff] [blame] | 333 | default is --verify, giving the hook a chance to prevent the |
| 334 | push. With --no-verify, the hook is bypassed completely. |
Junio C Hamano | dc8f8de | 2013-06-05 22:58:07 | [diff] [blame] | 335 | |
Junio C Hamano | 3fcdd07 | 2016-02-24 23:41:08 | [diff] [blame] | 336 | -4:: |
| 337 | --ipv4:: |
| 338 | Use IPv4 addresses only, ignoring IPv6 addresses. |
| 339 | |
| 340 | -6:: |
| 341 | --ipv6:: |
| 342 | Use IPv6 addresses only, ignoring IPv4 addresses. |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 343 | |
Junio C Hamano | 330aae6 | 2007-07-06 17:01:58 | [diff] [blame] | 344 | include::urls-remotes.txt[] |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 345 | |
Junio C Hamano | 6d559fc | 2008-02-20 10:44:26 | [diff] [blame] | 346 | OUTPUT |
| 347 | ------ |
| 348 | |
| 349 | The output of "git push" depends on the transport method used; this |
Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 350 | section describes the output when pushing over the Git protocol (either |
Junio C Hamano | 6d559fc | 2008-02-20 10:44:26 | [diff] [blame] | 351 | locally or via ssh). |
| 352 | |
| 353 | The status of the push is output in tabular form, with each line |
| 354 | representing the status of a single ref. Each line is of the form: |
| 355 | |
| 356 | ------------------------------- |
| 357 | <flag> <summary> <from> -> <to> (<reason>) |
| 358 | ------------------------------- |
| 359 | |
Junio C Hamano | 48bc1ce | 2009-07-09 16:49:19 | [diff] [blame] | 360 | If --porcelain is used, then each line of the output is of the form: |
| 361 | |
| 362 | ------------------------------- |
| 363 | <flag> \t <from>:<to> \t <summary> (<reason>) |
| 364 | ------------------------------- |
| 365 | |
Junio C Hamano | 78b92a8 | 2010-02-09 07:34:13 | [diff] [blame] | 366 | The status of up-to-date refs is shown only if --porcelain or --verbose |
| 367 | option is used. |
| 368 | |
Junio C Hamano | 6d559fc | 2008-02-20 10:44:26 | [diff] [blame] | 369 | flag:: |
Junio C Hamano | 78b92a8 | 2010-02-09 07:34:13 | [diff] [blame] | 370 | A single character indicating the status of the ref: |
| 371 | (space);; for a successfully pushed fast-forward; |
Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 372 | `+`;; for a successful forced update; |
Junio C Hamano | 78b92a8 | 2010-02-09 07:34:13 | [diff] [blame] | 373 | `-`;; for a successfully deleted ref; |
| 374 | `*`;; for a successfully pushed new ref; |
| 375 | `!`;; for a ref that was rejected or failed to push; and |
| 376 | `=`;; for a ref that was up to date and did not need pushing. |
Junio C Hamano | 6d559fc | 2008-02-20 10:44:26 | [diff] [blame] | 377 | |
| 378 | summary:: |
| 379 | For a successfully pushed ref, the summary shows the old and new |
| 380 | values of the ref in a form suitable for using as an argument to |
| 381 | `git log` (this is `<old>..<new>` in most cases, and |
Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 382 | `<old>...<new>` for forced non-fast-forward updates). |
Junio C Hamano | b4448a8 | 2010-07-26 09:02:32 | [diff] [blame] | 383 | + |
| 384 | For a failed update, more details are given: |
| 385 | + |
| 386 | -- |
| 387 | rejected:: |
| 388 | Git did not try to send the ref at all, typically because it |
| 389 | is not a fast-forward and you did not force the update. |
| 390 | |
| 391 | remote rejected:: |
| 392 | The remote end refused the update. Usually caused by a hook |
| 393 | on the remote side, or because the remote repository has one |
| 394 | of the following safety options in effect: |
| 395 | `receive.denyCurrentBranch` (for pushes to the checked out |
| 396 | branch), `receive.denyNonFastForwards` (for forced |
| 397 | non-fast-forward updates), `receive.denyDeletes` or |
| 398 | `receive.denyDeleteCurrent`. See linkgit:git-config[1]. |
| 399 | |
| 400 | remote failure:: |
| 401 | The remote end did not report the successful update of the ref, |
| 402 | perhaps because of a temporary error on the remote side, a |
| 403 | break in the network connection, or other transient error. |
| 404 | -- |
Junio C Hamano | 6d559fc | 2008-02-20 10:44:26 | [diff] [blame] | 405 | |
| 406 | from:: |
| 407 | The name of the local ref being pushed, minus its |
| 408 | `refs/<type>/` prefix. In the case of deletion, the |
| 409 | name of the local ref is omitted. |
| 410 | |
| 411 | to:: |
| 412 | The name of the remote ref being updated, minus its |
| 413 | `refs/<type>/` prefix. |
| 414 | |
| 415 | reason:: |
| 416 | A human-readable explanation. In the case of successfully pushed |
| 417 | refs, no explanation is needed. For a failed ref, the reason for |
| 418 | failure is described. |
Junio C Hamano | 6926bef | 2007-06-16 09:54:05 | [diff] [blame] | 419 | |
Junio C Hamano | 27a128b | 2009-08-13 01:23:00 | [diff] [blame] | 420 | Note about fast-forwards |
| 421 | ------------------------ |
| 422 | |
| 423 | When an update changes a branch (or more in general, a ref) that used to |
| 424 | point at commit A to point at another commit B, it is called a |
| 425 | fast-forward update if and only if B is a descendant of A. |
| 426 | |
| 427 | In a fast-forward update from A to B, the set of commits that the original |
| 428 | commit A built on top of is a subset of the commits the new commit B |
| 429 | builds on top of. Hence, it does not lose any history. |
| 430 | |
| 431 | In contrast, a non-fast-forward update will lose history. For example, |
| 432 | suppose you and somebody else started at the same commit X, and you built |
| 433 | a history leading to commit B while the other person built a history |
| 434 | leading to commit A. The history looks like this: |
| 435 | |
| 436 | ---------------- |
| 437 | |
| 438 | B |
| 439 | / |
| 440 | ---X---A |
| 441 | |
| 442 | ---------------- |
| 443 | |
| 444 | Further suppose that the other person already pushed changes leading to A |
Junio C Hamano | 70e980e | 2012-11-27 21:53:29 | [diff] [blame] | 445 | back to the original repository from which you two obtained the original |
| 446 | commit X. |
Junio C Hamano | 27a128b | 2009-08-13 01:23:00 | [diff] [blame] | 447 | |
| 448 | The push done by the other person updated the branch that used to point at |
| 449 | commit X to point at commit A. It is a fast-forward. |
| 450 | |
| 451 | But if you try to push, you will attempt to update the branch (that |
| 452 | now points at A) with commit B. This does _not_ fast-forward. If you did |
| 453 | so, the changes introduced by commit A will be lost, because everybody |
| 454 | will now start building on top of B. |
| 455 | |
| 456 | The command by default does not allow an update that is not a fast-forward |
| 457 | to prevent such loss of history. |
| 458 | |
Junio C Hamano | d75148a | 2014-04-08 19:48:38 | [diff] [blame] | 459 | If you do not want to lose your work (history from X to B) or the work by |
Junio C Hamano | 27a128b | 2009-08-13 01:23:00 | [diff] [blame] | 460 | the other person (history from X to A), you would need to first fetch the |
| 461 | history from the repository, create a history that contains changes done |
| 462 | by both parties, and push the result back. |
| 463 | |
| 464 | You can perform "git pull", resolve potential conflicts, and "git push" |
| 465 | the result. A "git pull" will create a merge commit C between commits A |
| 466 | and B. |
| 467 | |
| 468 | ---------------- |
| 469 | |
| 470 | B---C |
| 471 | / / |
| 472 | ---X---A |
| 473 | |
| 474 | ---------------- |
| 475 | |
| 476 | Updating A with the resulting merge commit will fast-forward and your |
| 477 | push will be accepted. |
| 478 | |
| 479 | Alternatively, you can rebase your change between X and B on top of A, |
| 480 | with "git pull --rebase", and push the result back. The rebase will |
| 481 | create a new commit D that builds the change between X and B on top of |
| 482 | A. |
| 483 | |
| 484 | ---------------- |
| 485 | |
| 486 | B D |
| 487 | / / |
| 488 | ---X---A |
| 489 | |
| 490 | ---------------- |
| 491 | |
| 492 | Again, updating A with this commit will fast-forward and your push will be |
| 493 | accepted. |
| 494 | |
| 495 | There is another common situation where you may encounter non-fast-forward |
| 496 | rejection when you try to push, and it is possible even when you are |
| 497 | pushing into a repository nobody else pushes into. After you push commit |
| 498 | A yourself (in the first picture in this section), replace it with "git |
| 499 | commit --amend" to produce commit B, and you try to push it out, because |
| 500 | forgot that you have pushed A out already. In such a case, and only if |
| 501 | you are certain that nobody in the meantime fetched your earlier commit A |
| 502 | (and started building on top of it), you can run "git push --force" to |
| 503 | overwrite it. In other words, "git push --force" is a method reserved for |
| 504 | a case where you do mean to lose history. |
| 505 | |
| 506 | |
Junio C Hamano | 6926bef | 2007-06-16 09:54:05 | [diff] [blame] | 507 | Examples |
| 508 | -------- |
| 509 | |
Junio C Hamano | 16ebcd0 | 2011-08-05 00:05:45 | [diff] [blame] | 510 | `git push`:: |
Junio C Hamano | ea82cff | 2009-03-18 01:54:48 | [diff] [blame] | 511 | Works like `git push <remote>`, where <remote> is the |
| 512 | current branch's remote (or `origin`, if no remote is |
| 513 | configured for the current branch). |
| 514 | |
Junio C Hamano | 16ebcd0 | 2011-08-05 00:05:45 | [diff] [blame] | 515 | `git push origin`:: |
Junio C Hamano | 1d669b8 | 2014-03-11 21:36:00 | [diff] [blame] | 516 | Without additional configuration, pushes the current branch to |
| 517 | the configured upstream (`remote.origin.merge` configuration |
| 518 | variable) if it has the same name as the current branch, and |
| 519 | errors out without pushing otherwise. |
Junio C Hamano | ea82cff | 2009-03-18 01:54:48 | [diff] [blame] | 520 | + |
| 521 | The default behavior of this command when no <refspec> is given can be |
Junio C Hamano | cb857f2 | 2012-10-02 22:50:01 | [diff] [blame] | 522 | configured by setting the `push` option of the remote, or the `push.default` |
| 523 | configuration variable. |
Junio C Hamano | ea82cff | 2009-03-18 01:54:48 | [diff] [blame] | 524 | + |
| 525 | For example, to default to pushing only the current branch to `origin` |
| 526 | use `git config remote.origin.push HEAD`. Any valid <refspec> (like |
| 527 | the ones in the examples below) can be configured as the default for |
| 528 | `git push origin`. |
| 529 | |
Junio C Hamano | 16ebcd0 | 2011-08-05 00:05:45 | [diff] [blame] | 530 | `git push origin :`:: |
Junio C Hamano | ea82cff | 2009-03-18 01:54:48 | [diff] [blame] | 531 | Push "matching" branches to `origin`. See |
| 532 | <refspec> in the <<OPTIONS,OPTIONS>> section above for a |
| 533 | description of "matching" branches. |
| 534 | |
Junio C Hamano | 16ebcd0 | 2011-08-05 00:05:45 | [diff] [blame] | 535 | `git push origin master`:: |
Junio C Hamano | 6926bef | 2007-06-16 09:54:05 | [diff] [blame] | 536 | Find a ref that matches `master` in the source repository |
| 537 | (most likely, it would find `refs/heads/master`), and update |
| 538 | the same ref (e.g. `refs/heads/master`) in `origin` repository |
Junio C Hamano | a9aee78 | 2008-04-23 16:09:20 | [diff] [blame] | 539 | with it. If `master` did not exist remotely, it would be |
| 540 | created. |
Junio C Hamano | 6926bef | 2007-06-16 09:54:05 | [diff] [blame] | 541 | |
Junio C Hamano | 16ebcd0 | 2011-08-05 00:05:45 | [diff] [blame] | 542 | `git push origin HEAD`:: |
Junio C Hamano | 8b6e23b | 2009-02-01 06:36:08 | [diff] [blame] | 543 | A handy way to push the current branch to the same name on the |
| 544 | remote. |
Junio C Hamano | 6926bef | 2007-06-16 09:54:05 | [diff] [blame] | 545 | |
Junio C Hamano | bccb0db | 2012-11-29 22:51:20 | [diff] [blame] | 546 | `git push mothership master:satellite/master dev:satellite/dev`:: |
Junio C Hamano | 7f80ae8 | 2008-07-30 18:31:35 | [diff] [blame] | 547 | Use the source ref that matches `master` (e.g. `refs/heads/master`) |
| 548 | to update the ref that matches `satellite/master` (most probably |
Junio C Hamano | bccb0db | 2012-11-29 22:51:20 | [diff] [blame] | 549 | `refs/remotes/satellite/master`) in the `mothership` repository; |
Junio C Hamano | 7f80ae8 | 2008-07-30 18:31:35 | [diff] [blame] | 550 | do the same for `dev` and `satellite/dev`. |
Junio C Hamano | bccb0db | 2012-11-29 22:51:20 | [diff] [blame] | 551 | + |
| 552 | This is to emulate `git fetch` run on the `mothership` using `git |
| 553 | push` that is run in the opposite direction in order to integrate |
| 554 | the work done on `satellite`, and is often necessary when you can |
| 555 | only make connection in one way (i.e. satellite can ssh into |
| 556 | mothership but mothership cannot initiate connection to satellite |
| 557 | because the latter is behind a firewall or does not run sshd). |
| 558 | + |
| 559 | After running this `git push` on the `satellite` machine, you would |
| 560 | ssh into the `mothership` and run `git merge` there to complete the |
| 561 | emulation of `git pull` that were run on `mothership` to pull changes |
| 562 | made on `satellite`. |
Junio C Hamano | 6926bef | 2007-06-16 09:54:05 | [diff] [blame] | 563 | |
Junio C Hamano | 16ebcd0 | 2011-08-05 00:05:45 | [diff] [blame] | 564 | `git push origin HEAD:master`:: |
Junio C Hamano | 8b6e23b | 2009-02-01 06:36:08 | [diff] [blame] | 565 | Push the current branch to the remote ref matching `master` in the |
| 566 | `origin` repository. This form is convenient to push the current |
| 567 | branch without thinking about its local name. |
| 568 | |
Junio C Hamano | 16ebcd0 | 2011-08-05 00:05:45 | [diff] [blame] | 569 | `git push origin master:refs/heads/experimental`:: |
Junio C Hamano | bfd4f9a | 2007-09-06 08:52:44 | [diff] [blame] | 570 | Create the branch `experimental` in the `origin` repository |
Junio C Hamano | a9aee78 | 2008-04-23 16:09:20 | [diff] [blame] | 571 | by copying the current `master` branch. This form is only |
| 572 | needed to create a new branch or tag in the remote repository when |
| 573 | the local name and the remote name are different; otherwise, |
| 574 | the ref name on its own will work. |
Junio C Hamano | bfd4f9a | 2007-09-06 08:52:44 | [diff] [blame] | 575 | |
Junio C Hamano | 16ebcd0 | 2011-08-05 00:05:45 | [diff] [blame] | 576 | `git push origin :experimental`:: |
Junio C Hamano | 8b6e23b | 2009-02-01 06:36:08 | [diff] [blame] | 577 | Find a ref that matches `experimental` in the `origin` repository |
| 578 | (e.g. `refs/heads/experimental`), and delete it. |
| 579 | |
Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 580 | `git push origin +dev:master`:: |
Junio C Hamano | d533bdb | 2009-02-25 09:56:58 | [diff] [blame] | 581 | Update the origin repository's master branch with the dev branch, |
Junio C Hamano | 3f680f3 | 2009-11-16 02:10:54 | [diff] [blame] | 582 | allowing non-fast-forward updates. *This can leave unreferenced |
Junio C Hamano | d533bdb | 2009-02-25 09:56:58 | [diff] [blame] | 583 | commits dangling in the origin repository.* Consider the |
Junio C Hamano | 3f680f3 | 2009-11-16 02:10:54 | [diff] [blame] | 584 | following situation, where a fast-forward is not possible: |
Junio C Hamano | d533bdb | 2009-02-25 09:56:58 | [diff] [blame] | 585 | + |
| 586 | ---- |
| 587 | o---o---o---A---B origin/master |
| 588 | \ |
| 589 | X---Y---Z dev |
| 590 | ---- |
| 591 | + |
| 592 | The above command would change the origin repository to |
| 593 | + |
| 594 | ---- |
| 595 | A---B (unnamed branch) |
| 596 | / |
| 597 | o---o---o---X---Y---Z master |
| 598 | ---- |
| 599 | + |
| 600 | Commits A and B would no longer belong to a branch with a symbolic name, |
| 601 | and so would be unreachable. As such, these commits would be removed by |
| 602 | a `git gc` command on the origin repository. |
| 603 | |
Junio C Hamano | 56ace3d | 2017-01-10 23:43:41 | [diff] [blame] | 604 | include::transfer-data-leaks.txt[] |
| 605 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 606 | GIT |
| 607 | --- |
Junio C Hamano | f7c042d | 2008-06-06 22:50:53 | [diff] [blame] | 608 | Part of the linkgit:git[1] suite |